Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 07:11:49 +0000 (07:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 07:11:49 +0000 (07:11 +0000)

Trivial merge